Skip to content

Use global wasm VM instead of keeping an additional reference in keeper. (backport #5146)#5253

Merged
crodriguezvega merged 3 commits into08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.xfrom
mergify/bp/08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.x/pr-5146
Nov 29, 2023
Merged

Use global wasm VM instead of keeping an additional reference in keeper. (backport #5146)#5253
crodriguezvega merged 3 commits into08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.xfrom
mergify/bp/08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.x/pr-5146

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Nov 29, 2023

This is an automatic backport of pull request #5146 done by Mergify.
Cherry-pick of 595e1a9 has failed:

On branch mergify/bp/08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.x/pr-5146
Your branch is up to date with 'origin/08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.x'.

You are currently cherry-picking commit 595e1a93.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   modules/light-clients/08-wasm/keeper/grpc_query.go
	modified:   modules/light-clients/08-wasm/keeper/msg_server.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/light-clients/08-wasm/keeper/genesis.go
	both modified:   modules/light-clients/08-wasm/keeper/keeper.go
	both modified:   modules/light-clients/08-wasm/keeper/snapshotter.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…er. (#5146)

(cherry picked from commit 595e1a9)

# Conflicts:
#	modules/light-clients/08-wasm/keeper/genesis.go
#	modules/light-clients/08-wasm/keeper/keeper.go
#	modules/light-clients/08-wasm/keeper/snapshotter.go
…o mergify/bp/08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.x/pr-5146

# Conflicts:
#	modules/light-clients/08-wasm/keeper/genesis.go
#	modules/light-clients/08-wasm/keeper/keeper.go
#	modules/light-clients/08-wasm/keeper/snapshotter.go
@crodriguezvega crodriguezvega merged commit 6cfe9d8 into 08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.x Nov 29, 2023
@crodriguezvega crodriguezvega deleted the mergify/bp/08-wasm/release/v0.1.x+ibc-go-v8.0.x-wasmvm-v1.5.x/pr-5146 branch November 29, 2023 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants